packages/web/src/layouts/pool/pool-detail/containers/my-liquidity-container/MyLiquidityContainer.tsx (2)

111-115: ⚠️ Potential issue | 🟡 Minor

Invalidate positionRewards after pool-detail claims.

Claiming changes the data returned by useGetPositionRewards, but this refresh path only invalidates balances, positions, and bins. Add the new query key so portfolio reward totals/claim-all inputs do not stay stale after claiming from pool detail.

Proposed fix

     invalidateQueryKey("MyLiquidity, Claim", [
       [QUERY_KEY.tokenBalancesByAddress, address],
       [QUERY_KEY.positions, currentChainId, address],
+      [QUERY_KEY.positionRewards, currentChainId, address],
       [QUERY_KEY.poolPairBins],
     ]);

---

237-251: ⚠️ Potential issue | 🟠 Major

Avoid entering loading state for an empty claim-all input.

claimAll returns null when both reward position lists are empty, but this handler already shows the pending broadcast and sets loadingTransactionClaim to true; that no-op path never resets the loading state.

Proposed fix

   const claimAllReward = () => {
-    const amount = openedPosition
-      .filter(item => !item.closed)
+    const openedClaimablePositions = openedPosition.filter(item => !item.closed);
+    const claimAllInput = buildClaimAllInputFromPositions(openedClaimablePositions);
+
+    if (claimAllInput.positionsWithSwapFee.length === 0 && claimAllInput.positionsWithStakingReward.length === 0) {
+      return;
+    }
+
+    const amount = openedClaimablePositions
       .flatMap(item => item.rewards)
       .reduce((acc, item) => acc + Number(item.claimableUsd), 0);
 
@@
 
     broadcastLoading(getMessage(DexEvent.CLAIM_FEE, "pending", messageData));
 
     setLoadingTransactionClaim(true);
-    const claimAllInput = buildClaimAllInputFromPositions(openedPosition.filter(item => !item.closed));
     claimAll({ rpcProvider, input: claimAllInput }).then(response => {

packages/web/src/layouts/portfolio/containers/wallet-balance-container/WalletBalanceContainer.tsx (1)

137-172: ⚠️ Potential issue | 🟠 Major

Reset claim loading when claimAll returns null or rejects.

Line 137 turns on the loading state, but claimAll can resolve null for empty input/missing address/caught repository errors. That path never enters the if (response) block, leaving the claim button stuck in loading.

🐛 Proposed fix

     setLoadingTransactionClaim(true);
-    claimAll({ rpcProvider, input: claimAllInput }).then(response => {
-      if (response) {
+    claimAll({ rpcProvider, input: claimAllInput })
+      .then(response => {
+        if (!response) {
+          broadcastError(BROADCAST_ERROR_VALUE.DEFAULT);
+          setLoadingTransactionClaim(false);
+          return;
+        }
+
         if (response?.code === 0 || response?.code === ERROR_VALUE.TRANSACTION_FAILED.status) {
           enqueueEvent({
             txHash: response?.data?.hash,
             action: DexEvent.CLAIM_FEE,
             checkWugnotTransfer: true,
@@
           broadcastError(BROADCAST_ERROR_VALUE.DEFAULT);
           setLoadingTransactionClaim(false);
         }
-      }
-    });
+      })
+      .catch(() => {
+        broadcastError(BROADCAST_ERROR_VALUE.DEFAULT);
+        setLoadingTransactionClaim(false);
+      });

packages/web/src/layouts/portfolio/components/wallet-balance/wallet-balance-detail/WalletBalanceDetail.tsx (1)

106-148: ⚠️ Potential issue | 🟠 Major

Don’t gate claim-all availability on tooltip token metadata.

Line 108 drops rewards when tokens lacks metadata, and Line 147 then disables claim-all based on those tooltip arrays. A missing or late token entry can hide the claim-all button even when positionRewards contains claimable position IDs.

🐛 Proposed fix

   const isClaimableAll = useMemo(() => {
     if (balanceDetailInfo.loadingPositions) return false;
-    return hasInfo(claimableRewardInfo);
-  }, [claimableRewardInfo, balanceDetailInfo.loadingPositions]);
+    return (
+      !!positionRewards &&
+      (positionRewards.positionsWithSwapFee.length > 0 || positionRewards.positionsWithStakingReward.length > 0)
+    );
+  }, [balanceDetailInfo.loadingPositions, positionRewards]);